build: rm configure_build macro set items in main CMakeLists.txt
This commit is contained in:
committed by
Chris Rizzitello
parent
d6c682a923
commit
57f6248b6a
@ -89,6 +89,11 @@ if(APPLE)
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET 12)
|
||||
endif()
|
||||
|
||||
# Set Output Folders
|
||||
# TODO Remove when new wix packages are made with cpack
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
|
||||
|
||||
include(cmake/Definitions.cmake)
|
||||
include(cmake/Build.cmake)
|
||||
include(cmake/Libraries.cmake)
|
||||
@ -97,7 +102,6 @@ include(cmake/Packaging.cmake)
|
||||
include(GNUInstallDirs)
|
||||
|
||||
configure_definitions()
|
||||
configure_build()
|
||||
configure_libs()
|
||||
|
||||
add_subdirectory(doc)
|
||||
|
||||
@ -13,11 +13,6 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
macro(configure_build)
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
|
||||
endmacro()
|
||||
|
||||
macro(post_config)
|
||||
|
||||
# Build to a temp bin dir on Windows and then copy to the final bin dir
|
||||
|
||||
Reference in New Issue
Block a user